Use a different curl-rust for now

Waiting on fixes to be merged upstream

diff --git a/Cargo.toml b/Cargo.toml
index 54431fdf2d705970d8dd755b019625da48fc96dc..ead976c619c8f99fb4c6a74e1581daa2107e506d 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,8 @@ git = "https://github.com/servo/rust-url"
 git = "https://github.com/rust-lang/semver"
 
 [dependencies.curl]
-git = "https://github.com/carllerche/curl-rust"
+git = "https://github.com/alexcrichton/curl-rust"
+branch = "bundle"
 
 [dependencies.tar]
 git = "https://github.com/alexcrichton/tar-rs"

diff --git a/src/cargo/util/sha256.rs b/src/cargo/util/sha256.rs
index 030bbd36151a53d8315bfcbb2fe5d080c32d87f3..cce484613a9712ef16aabe0279502cd6f3badf1e 100644 (file)
--- a/src/cargo/util/sha256.rs
+++ b/src/cargo/util/sha256.rs
@@ -1,3 +1,5 @@
+#![allow(bad_style)]
+
 pub use self::imp::Sha256;
 
 // Someone upstream will link to OpenSSL, so we don't need to explicitly